From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Nov 2009 21:22:22 +0000 (-0500)
Subject: [StTooltip] Fix _get_preferred_width
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10678
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=263d738ef66a0f1fc55f58d5c7fb369066a55df3;p=gnome-shell.git

[StTooltip] Fix _get_preferred_width

It was ignoring the label width.

https://bugzilla.gnome.org/show_bug.cgi?id=600734
---

diff --git a/src/st/st-tooltip.c b/src/st/st-tooltip.c
index 5232dbc41..1fbec22e3 100644
--- a/src/st/st-tooltip.c
+++ b/src/st/st-tooltip.c
@@ -148,7 +148,6 @@ st_tooltip_get_preferred_width (ClutterActor *self,
 {
   StTooltipPrivate *priv = ST_TOOLTIP (self)->priv;
   StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
-  gfloat min_label_w, natural_label_w;
   gfloat label_height, arrow_height;
   ClutterActor *arrow_image;
 
@@ -180,13 +179,8 @@ st_tooltip_get_preferred_width (ClutterActor *self,
     {
       clutter_actor_get_preferred_width (priv->label,
                                          label_height,
-                                         &min_label_w,
-                                         &natural_label_w);
-    }
-  else
-    {
-      min_label_w = 0;
-      natural_label_w = 0;
+                                         min_width_p,
+                                         natural_width_p);
     }
 
   st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);